Fix tools to pull public header files from standard

location in libxc directory. Not direct from xen and
xenlinux build trees! Also fix a type name in
x86_emulator test harness.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/firmware/vmxassist/Makefile b/tools/firmware/vmxassist/Makefile
index 8a7de8584909263ce4035ca146be1cdc7eb3be8a..9d34c26677ec49a64a65cf3e361cb361302c6271 100644 (file)
--- a/tools/firmware/vmxassist/Makefile
+++ b/tools/firmware/vmxassist/Makefile
@@ -25,9 +25,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 TEXTADDR=0x000D0000
 
 DEFINES=-DDEBUG -DTEXTADDR=${TEXTADDR}
-XENINC=-I$(XEN_ROOT)/xen/include -I$(XEN_ROOT)/tools/libxc
-#DEFINES=-DDEBUG -DTEST -DTEXTADDR=${TEXTADDR}
-#XENINC=-I/home/leendert/xen/xeno-unstable.bk/xen/include
+XENINC=-I$(XEN_ROOT)/tools/libxc
 
 LD       = ld
 CC       = gcc

diff --git a/tools/firmware/vmxassist/vm86.h b/tools/firmware/vmxassist/vm86.h
index 6ed20c7954202cbb243ddd290f8e4d37037e5e9c..b15493215fb7cd40d99e1481d3ba26de41f751a6 100644 (file)
--- a/tools/firmware/vmxassist/vm86.h
+++ b/tools/firmware/vmxassist/vm86.h
@@ -33,7 +33,7 @@ typedef int32_t            s32;
 typedef int64_t            s64;
 #endif
 
-#include <public/vmx_assist.h>
+#include <xen/vmx_assist.h>
 
 #define        NR_EXCEPTION_HANDLER    32
 #define        NR_INTERRUPT_HANDLERS   16

diff --git a/tools/ioemu/hw/i8254.c b/tools/ioemu/hw/i8254.c
index c92a51ba5194b1979e8dff5977a18c185bdb658b..b506acc69509112e656cca0848a97cf095d06bce 100644 (file)
--- a/tools/ioemu/hw/i8254.c
+++ b/tools/ioemu/hw/i8254.c
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 #include "vl.h"
-#include "xenctrl.h"
-#include <io/ioreq.h>
+#include <xenctrl.h>
+#include <xen/io/ioreq.h>
 
 //#define DEBUG_PIT
 

diff --git a/tools/ioemu/hw/i8259.c b/tools/ioemu/hw/i8259.c
index 06c39fb07cfd28a147ea6dbe3579fdd98f4dab95..17dd549c530ba6349a66a00a9f564aee69a6930b 100644 (file)
--- a/tools/ioemu/hw/i8259.c
+++ b/tools/ioemu/hw/i8259.c
@@ -22,8 +22,8 @@
  * THE SOFTWARE.
  */
 #include "vl.h"
-#include "xenctrl.h"
-#include <io/ioreq.h>
+#include <xenctrl.h>
+#include <xen/io/ioreq.h>
 
 /* debug PIC */
 //#define DEBUG_PIC

diff --git a/tools/ioemu/hw/ioapic.h b/tools/ioemu/hw/ioapic.h
index 1e70c865af8aad20cfc5e38c5d32d3b4b385fd40..5e14174c21961aa476580a962bd53c492d887d25 100644 (file)
--- a/tools/ioemu/hw/ioapic.h
+++ b/tools/ioemu/hw/ioapic.h
@@ -26,9 +26,9 @@
 #ifndef __IOAPIC_H
 #define __IOAPIC_H
 
-#include "xenctrl.h"
-#include <io/ioreq.h>
-#include <io/vmx_vlapic.h>
+#include <xenctrl.h>
+#include <xen/io/ioreq.h>
+#include <xen/io/vmx_vlapic.h>
 
 #define IOAPIC_NUM_PINS 24
 #define IOAPIC_VERSION_ID 0x11

diff --git a/tools/ioemu/target-i386-dm/Makefile b/tools/ioemu/target-i386-dm/Makefile
index 856be8fe87666988e7f2e5e365b3516968069138..ec0c7a513af2ddb45f958bc336a1e1e333aa5b64 100644 (file)
--- a/tools/ioemu/target-i386-dm/Makefile
+++ b/tools/ioemu/target-i386-dm/Makefile
@@ -6,7 +6,7 @@ override TARGET_ARCH=i386
 INSTALL_DIR := $(DESTDIR)/usr/$(LIBDIR)/xen/bin
 TARGET_PATH=$(SRC_PATH)/target-$(TARGET_ARCH)
 VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/audio
-DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH) -I$(XEN_ROOT)/xen/include/public
+DEFINES=-I. -I$(TARGET_PATH) -I$(SRC_PATH)
 DEFINES+= -I$(XEN_ROOT)/tools/libxc
 ifdef CONFIG_USER_ONLY
 VPATH+=:$(SRC_PATH)/linux-user

diff --git a/tools/ioemu/target-i386-dm/helper2.c b/tools/ioemu/target-i386-dm/helper2.c
index 49c2804c722c326eecf165215c7c7b08a69ec92d..a3c22d5f1ab749709c9a832d12f666e88d6571bc 100644 (file)
--- a/tools/ioemu/target-i386-dm/helper2.c
+++ b/tools/ioemu/target-i386-dm/helper2.c
@@ -47,8 +47,8 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#include "xenctrl.h"
-#include <io/ioreq.h>
+#include <xenctrl.h>
+#include <xen/io/ioreq.h>
 
 #include "cpu.h"
 #include "exec-all.h"

diff --git a/tools/tests/test_x86_emulator.c b/tools/tests/test_x86_emulator.c
index e6df8092bcfeea98426ea0ddf71997c6392d59e3..69989bc77608e4ecfb7dbe90468f147c5067495d 100644 (file)
--- a/tools/tests/test_x86_emulator.c
+++ b/tools/tests/test_x86_emulator.c
@@ -78,7 +78,7 @@ static struct x86_mem_emulator emulops = {
 
 int main(int argc, char **argv)
 {
-    struct xen_regs regs;
+    struct cpu_user_regs regs;
     char instr[20] = { 0x01, 0x08 }; /* add %ecx,(%eax) */
     unsigned int res = 0x7FFFFFFF;
     u32 cmpxchg8b_res[2] = { 0x12345678, 0x87654321 };

diff --git a/tools/xenstat/libxenstat/Makefile b/tools/xenstat/libxenstat/Makefile
index 4d7097c64a064e5a0052b2b26b26566bb93b3afe..750adaaa293d00cf592ceca6ab1fef99db81f823 100644 (file)
--- a/tools/xenstat/libxenstat/Makefile
+++ b/tools/xenstat/libxenstat/Makefile
@@ -38,9 +38,7 @@ SONAME_FLAGS=-Wl,-soname -Wl,libxenstat.so.$(MAJOR)
 
 WARN_FLAGS=-Wall -Werror
 
-CFLAGS+=-Isrc
-CFLAGS+=-I$(XEN_ROOT)/xen/include/public
-CFLAGS+=-I$(LINUX_ROOT)/include/asm-xen/linux-public/
+CFLAGS+=-Isrc -I$(XEN_LIBXC)
 LDFLAGS+=-Lsrc
 
 all: $(LIB)

diff --git a/tools/xenstat/libxenstat/src/xen-interface.c b/tools/xenstat/libxenstat/src/xen-interface.c
index d3a560a69fbf49240af4fa73b17ed3c4b9b3a5af..9358494d115f6b3ba200113d4b3c76372cf7dac5 100644 (file)
--- a/tools/xenstat/libxenstat/src/xen-interface.c
+++ b/tools/xenstat/libxenstat/src/xen-interface.c
@@ -23,9 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include "version.h"
-#include "privcmd.h"
-#include "xen.h"
+#include <xen/linux/privcmd.h>
 
 struct xi_handle {
        int fd;

diff --git a/tools/xenstat/libxenstat/src/xen-interface.h b/tools/xenstat/libxenstat/src/xen-interface.h
index c60655a378bc2ead943ef3c0a38a709c091d7f20..317e08581c2a93009e05234dd21a91ec2d7af04a 100644 (file)
--- a/tools/xenstat/libxenstat/src/xen-interface.h
+++ b/tools/xenstat/libxenstat/src/xen-interface.h
@@ -26,8 +26,9 @@ typedef uint16_t u16;
 typedef uint32_t u32;
 typedef uint64_t u64;
 
-#include "dom0_ops.h"
-#include "version.h"
+#include <xen/xen.h>
+#include <xen/dom0_ops.h>
+#include <xen/version.h>
 
 /* Opaque handles */
 typedef struct xi_handle xi_handle;

diff --git a/tools/xenstat/libxenstat/src/xenstat.c b/tools/xenstat/libxenstat/src/xenstat.c
index d5a44961925d99b33a9acf558ea04e4492e9c548..c58a720bb855c24f94b7ca074d074aba5af3c973 100644 (file)
--- a/tools/xenstat/libxenstat/src/xenstat.c
+++ b/tools/xenstat/libxenstat/src/xenstat.c
@@ -22,7 +22,6 @@
 #include <unistd.h>
 #include <xen-interface.h>
 #include "xenstat.h"
-#include "version.h"
 
 /*
  * Types

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index e8cfca1b3f76793f0cafe7eb0273322513240b40..7930789c8ceb7e4ea89846a9d759495ed66c5bcc 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -15,7 +15,6 @@ PROG_DEP = .*.d
 BASECFLAGS+= -O3 $(PROFILE)
 #BASECFLAGS+= -I$(XEN_ROOT)/tools
 BASECFLAGS+= -I$(XEN_ROOT)/tools/libxc
-BASECFLAGS+= -I$(XEN_ROOT)/xen/include/public
 BASECFLAGS+= -I.
 
 CFLAGS  += $(BASECFLAGS)